update Rails to 4.1.8
Andrew Cantino
共有 2 个文件被更改，包括 35 次插入 和 37 次删除
+ 1
- 1
Gemfile
@@ -73,7 +73,7 @@ gem 'mysql2', '~> 0.3.16' |
||
| 73 | 73 |
gem 'multi_xml' |
| 74 | 74 |
gem 'nokogiri', '~> 1.6.4' |
| 75 | 75 |
gem 'omniauth' |
| 76 |
-gem 'rails' , '~> 4.1.7' |
|
| 76 |
+gem 'rails' , '~> 4.1.8' |
|
| 77 | 77 |
gem 'rufus-scheduler', '~> 3.0.8', require: false |
| 78 | 78 |
gem 'sass-rails', '~> 4.0.0' |
| 79 | 79 |
gem 'select2-rails', '~> 3.5.4' |
+ 34
- 36
Gemfile.lock
@@ -12,27 +12,27 @@ GEM |
||
| 12 | 12 |
remote: https://rubygems.org/ |
| 13 | 13 |
specs: |
| 14 | 14 |
ace-rails-ap (2.0.1) |
| 15 |
- actionmailer (4.1.7) |
|
| 16 |
- actionpack (= 4.1.7) |
|
| 17 |
- actionview (= 4.1.7) |
|
| 15 |
+ actionmailer (4.1.8) |
|
| 16 |
+ actionpack (= 4.1.8) |
|
| 17 |
+ actionview (= 4.1.8) |
|
| 18 | 18 |
mail (~> 2.5, >= 2.5.4) |
| 19 |
- actionpack (4.1.7) |
|
| 20 |
- actionview (= 4.1.7) |
|
| 21 |
- activesupport (= 4.1.7) |
|
| 19 |
+ actionpack (4.1.8) |
|
| 20 |
+ actionview (= 4.1.8) |
|
| 21 |
+ activesupport (= 4.1.8) |
|
| 22 | 22 |
rack (~> 1.5.2) |
| 23 | 23 |
rack-test (~> 0.6.2) |
| 24 |
- actionview (4.1.7) |
|
| 25 |
- activesupport (= 4.1.7) |
|
| 24 |
+ actionview (4.1.8) |
|
| 25 |
+ activesupport (= 4.1.8) |
|
| 26 | 26 |
builder (~> 3.1) |
| 27 | 27 |
erubis (~> 2.7.0) |
| 28 |
- activemodel (4.1.7) |
|
| 29 |
- activesupport (= 4.1.7) |
|
| 28 |
+ activemodel (4.1.8) |
|
| 29 |
+ activesupport (= 4.1.8) |
|
| 30 | 30 |
builder (~> 3.1) |
| 31 |
- activerecord (4.1.7) |
|
| 32 |
- activemodel (= 4.1.7) |
|
| 33 |
- activesupport (= 4.1.7) |
|
| 31 |
+ activerecord (4.1.8) |
|
| 32 |
+ activemodel (= 4.1.8) |
|
| 33 |
+ activesupport (= 4.1.8) |
|
| 34 | 34 |
arel (~> 5.0.0) |
| 35 |
- activesupport (4.1.7) |
|
| 35 |
+ activesupport (4.1.8) |
|
| 36 | 36 |
i18n (~> 0.6, >= 0.6.9) |
| 37 | 37 |
json (~> 1.7, >= 1.7.7) |
| 38 | 38 |
minitest (~> 5.1) |
@@ -209,15 +209,14 @@ GEM |
||
| 209 | 209 |
lumberjack (1.0.9) |
| 210 | 210 |
macaddr (1.7.1) |
| 211 | 211 |
systemu (~> 2.6.2) |
| 212 |
- mail (2.5.4) |
|
| 213 |
- mime-types (~> 1.16) |
|
| 214 |
- treetop (~> 1.4.8) |
|
| 212 |
+ mail (2.6.3) |
|
| 213 |
+ mime-types (>= 1.16, < 3) |
|
| 215 | 214 |
memoizable (0.4.2) |
| 216 | 215 |
thread_safe (~> 0.3, >= 0.3.1) |
| 217 | 216 |
method_source (0.8.2) |
| 218 | 217 |
mime-types (1.25.1) |
| 219 | 218 |
mini_portile (0.6.1) |
| 220 |
- minitest (5.4.0) |
|
| 219 |
+ minitest (5.4.3) |
|
| 221 | 220 |
mqtt (0.3.1) |
| 222 | 221 |
multi_json (1.10.1) |
| 223 | 222 |
multi_xml (0.5.5) |
@@ -269,28 +268,28 @@ GEM |
||
| 269 | 268 |
rack (1.5.2) |
| 270 | 269 |
rack-test (0.6.2) |
| 271 | 270 |
rack (>= 1.0) |
| 272 |
- rails (4.1.7) |
|
| 273 |
- actionmailer (= 4.1.7) |
|
| 274 |
- actionpack (= 4.1.7) |
|
| 275 |
- actionview (= 4.1.7) |
|
| 276 |
- activemodel (= 4.1.7) |
|
| 277 |
- activerecord (= 4.1.7) |
|
| 278 |
- activesupport (= 4.1.7) |
|
| 271 |
+ rails (4.1.8) |
|
| 272 |
+ actionmailer (= 4.1.8) |
|
| 273 |
+ actionpack (= 4.1.8) |
|
| 274 |
+ actionview (= 4.1.8) |
|
| 275 |
+ activemodel (= 4.1.8) |
|
| 276 |
+ activerecord (= 4.1.8) |
|
| 277 |
+ activesupport (= 4.1.8) |
|
| 279 | 278 |
bundler (>= 1.3.0, < 2.0) |
| 280 |
- railties (= 4.1.7) |
|
| 279 |
+ railties (= 4.1.8) |
|
| 281 | 280 |
sprockets-rails (~> 2.0) |
| 282 | 281 |
rails_12factor (0.0.2) |
| 283 | 282 |
rails_serve_static_assets |
| 284 | 283 |
rails_stdout_logging |
| 285 | 284 |
rails_serve_static_assets (0.0.2) |
| 286 | 285 |
rails_stdout_logging (0.0.3) |
| 287 |
- railties (4.1.7) |
|
| 288 |
- actionpack (= 4.1.7) |
|
| 289 |
- activesupport (= 4.1.7) |
|
| 286 |
+ railties (4.1.8) |
|
| 287 |
+ actionpack (= 4.1.8) |
|
| 288 |
+ activesupport (= 4.1.8) |
|
| 290 | 289 |
rake (>= 0.8.7) |
| 291 | 290 |
thor (>= 0.18.1, < 2.0) |
| 292 | 291 |
raindrops (0.13.0) |
| 293 |
- rake (10.3.2) |
|
| 292 |
+ rake (10.4.2) |
|
| 294 | 293 |
rb-fsevent (0.9.4) |
| 295 | 294 |
rb-inotify (0.9.5) |
| 296 | 295 |
ffi (>= 0.5.0) |
@@ -372,10 +371,10 @@ GEM |
||
| 372 | 371 |
multi_json (~> 1.0) |
| 373 | 372 |
rack (~> 1.0) |
| 374 | 373 |
tilt (~> 1.1, != 1.3.0) |
| 375 |
- sprockets-rails (2.1.3) |
|
| 374 |
+ sprockets-rails (2.2.2) |
|
| 376 | 375 |
actionpack (>= 3.0) |
| 377 | 376 |
activesupport (>= 3.0) |
| 378 |
- sprockets (~> 2.8) |
|
| 377 |
+ sprockets (>= 2.8, < 4.0) |
|
| 379 | 378 |
string-scrub (0.0.5) |
| 380 | 379 |
systemu (2.6.4) |
| 381 | 380 |
term-ansicolor (1.3.0) |
@@ -388,9 +387,8 @@ GEM |
||
| 388 | 387 |
tilt (1.4.1) |
| 389 | 388 |
timers (1.1.0) |
| 390 | 389 |
tins (1.3.2) |
| 391 |
- treetop (1.4.15) |
|
| 392 |
- polyglot |
|
| 393 |
- polyglot (>= 0.3.1) |
|
| 390 |
+ treetop (1.5.3) |
|
| 391 |
+ polyglot (~> 0.3) |
|
| 394 | 392 |
tumblr_client (0.8.4) |
| 395 | 393 |
faraday (~> 0.9.0) |
| 396 | 394 |
faraday_middleware (~> 0.9.0) |
@@ -502,7 +500,7 @@ DEPENDENCIES |
||
| 502 | 500 |
pry |
| 503 | 501 |
quiet_assets |
| 504 | 502 |
rack |
| 505 |
- rails (~> 4.1.7) |
|
| 503 |
+ rails (~> 4.1.8) |
|
| 506 | 504 |
rails_12factor |
| 507 | 505 |
rr |
| 508 | 506 |
rspec (~> 3.0) |